button: Use _gtk_widget_get_preferred_size_for_size()
authorBenjamin Otte <otte@redhat.com>
Sat, 27 Apr 2013 21:24:41 +0000 (23:24 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 1 May 2013 14:41:11 +0000 (16:41 +0200)
This was accidently lost when merging baseline support.

gtk/gtkbutton.c

index 6206dbb5b55b1b77a0e5b2e088bb2315b817ef07..f22b5829c9fe5e0fbbdad20f636823a7f61acc19 100644 (file)
@@ -53,6 +53,7 @@
 #include "gtkactivatable.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
+#include "gtkwidgetprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "a11y/gtkbuttonaccessible.h"
@@ -2152,10 +2153,11 @@ gtk_button_get_size (GtkWidget      *widget,
       gint child_min, child_nat;
       gint child_min_baseline = -1, child_nat_baseline = -1;
 
-      if (orientation == GTK_ORIENTATION_HORIZONTAL)
-       gtk_widget_get_preferred_width (child, &child_min, &child_nat);
-      else
-       gtk_widget_get_preferred_height_and_baseline_for_width (child, -1, &child_min, &child_nat, &child_min_baseline, &child_nat_baseline);
+      _gtk_widget_get_preferred_size_for_size (child,
+                                               orientation,
+                                               for_size,
+                                               &child_min, &child_nat,
+                                               &child_min_baseline, &child_nat_baseline);
 
       if (minimum_baseline && child_min_baseline >= 0)
        *minimum_baseline = child_min_baseline + top_offset;